bitkeeper revision 1.745 (403b535dxe-hvv9dM0KddL1LhR9pdQ)

e1000_main.c, cciss.c:
  Quieten unused device drivers in Xen.

diff --git a/xen/drivers/block/cciss.c b/xen/drivers/block/cciss.c
index 1cd341fa61c8afe4658411201a2f2a567795a0ab..e61526625ca0673361b88491eb614f49c80e7e5d 100644 (file)
--- a/xen/drivers/block/cciss.c
+++ b/xen/drivers/block/cciss.c
@@ -3415,10 +3415,10 @@ static struct pci_driver cciss_pci_driver = {
 */
 int __init cciss_init(void)
 {
-
-       printk(KERN_INFO DRIVER_NAME "\n");
-       /* Register for out PCI devices */
-       return pci_module_init(&cciss_pci_driver);
+       int ret = pci_module_init(&cciss_pci_driver);
+       if (ret >= 0)
+               printk(KERN_INFO DRIVER_NAME "\n");
+       return ret;
 }
 
 EXPORT_NO_SYMBOLS;

diff --git a/xen/drivers/net/e1000/e1000_main.c b/xen/drivers/net/e1000/e1000_main.c
index f6f5bb7aa80a7bf806ddc56641783d551fa8b874..4b29541b8d0512491c1f2a58a24d1d939dedfc8d 100644 (file)
--- a/xen/drivers/net/e1000/e1000_main.c
+++ b/xen/drivers/net/e1000/e1000_main.c
@@ -219,13 +219,12 @@ static int __init
 e1000_init_module(void)
 {
        int ret;
-       printk(KERN_INFO "%s - version %s\n",
-              e1000_driver_string, e1000_driver_version);
-
-       printk(KERN_INFO "%s\n", e1000_copyright);
 
        ret = pci_module_init(&e1000_driver);
        if(ret >= 0) {
+               printk(KERN_INFO "%s - version %s\n",
+                      e1000_driver_string, e1000_driver_version);
+               printk(KERN_INFO "%s\n", e1000_copyright);
                //register_reboot_notifier(&e1000_notifier_reboot);
        }
        return ret;